Skip to content

Add single section dumping and output file padding to InstallRawStep#10267

Merged
andrewrk merged 1 commit intoziglang:masterfrom
N00byEdge:master
Dec 4, 2021
Merged

Add single section dumping and output file padding to InstallRawStep#10267
andrewrk merged 1 commit intoziglang:masterfrom
N00byEdge:master

Conversation

@N00byEdge
Copy link
Copy Markdown
Contributor

This removes the need for using tools like objcopy to copy out a single section, and truncate to pad binaries to the required size while building.

Comment thread lib/std/build/InstallRawStep.zig Outdated
@marler8997
Copy link
Copy Markdown
Contributor

Part of your PR conflicts with my PR here #9975

Looks like we both had the same idea to add Options to InstallRawStep.

@N00byEdge
Copy link
Copy Markdown
Contributor Author

@marler8997 Oh wow our code looks really similar. That's a fun realization. Uh, I guess I could solve the merge conflict if your PR gets merged. Thanks for the heads up.

@andrewrk
Copy link
Copy Markdown
Member

andrewrk commented Dec 3, 2021

#9975 merged. Apologies to both of you for the delay on that one.

@N00byEdge
Copy link
Copy Markdown
Contributor Author

Okay, I'll resolve the conflicts

@N00byEdge N00byEdge marked this pull request as draft December 3, 2021 21:07
@N00byEdge N00byEdge marked this pull request as ready for review December 3, 2021 21:09
@andrewrk
Copy link
Copy Markdown
Member

andrewrk commented Dec 3, 2021

/workspace/lib/std/build/InstallRawStep.zig:350:87: error: use of undeclared identifier 'Options'
/workspace/lib/std/build/InstallRawStep.zig:428:10: error: use of undeclared identifier 'Options'

@N00byEdge
Copy link
Copy Markdown
Contributor Author

N00byEdge commented Dec 3, 2021

Oh, sorry about that, merge conflict fail

@andrewrk andrewrk merged commit 9354ad8 into ziglang:master Dec 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants